[mlir][SPIRVToLLVM] Erase empty spirv.mlir.loop in LoopPattern
#113527
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR erases `spirv.mlir.loop` with an empty region in `LoopPattern`, resolving a crash.
Member
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-spirv Author: Longsheng Mou (CoTinker) ChangesThis PR erases Full diff: https://github.com/llvm/llvm-project/pull/113527.diff 2 Files Affected:
diff --git a/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp b/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
index 74c169c9a7e76a..044a3c8c65e3b2 100644
--- a/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
+++ b/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
@@ -1083,6 +1083,12 @@ class LoopPattern : public SPIRVToLLVMConversion<spirv::LoopOp> {
if (loopOp.getLoopControl() != spirv::LoopControl::None)
return failure();
+ // `spirv.mlir.loop` with empty region is redundant and should be erased.
+ if (loopOp.getBody().empty()) {
+ rewriter.eraseOp(loopOp);
+ return success();
+ }
+
Location loc = loopOp.getLoc();
// Split the current block after `spirv.mlir.loop`. The remaining ops will
diff --git a/mlir/test/Conversion/SPIRVToLLVM/control-flow-ops-to-llvm.mlir b/mlir/test/Conversion/SPIRVToLLVM/control-flow-ops-to-llvm.mlir
index 3557830e779e24..756fc5415e20f7 100644
--- a/mlir/test/Conversion/SPIRVToLLVM/control-flow-ops-to-llvm.mlir
+++ b/mlir/test/Conversion/SPIRVToLLVM/control-flow-ops-to-llvm.mlir
@@ -86,6 +86,14 @@ spirv.module Logical GLSL450 {
//===----------------------------------------------------------------------===//
spirv.module Logical GLSL450 {
+ // CHECK-LABEL: @empty_loop
+ spirv.func @empty_loop() "None" {
+ // CHECK: llvm.return
+ spirv.mlir.loop {
+ }
+ spirv.Return
+ }
+
// CHECK-LABEL: @infinite_loop
spirv.func @infinite_loop(%count : i32) -> () "None" {
// CHECK: llvm.br ^[[BB1:.*]]
|
kuhar
approved these changes
Oct 25, 2024
winner245
pushed a commit
to winner245/llvm-project
that referenced
this pull request
Oct 26, 2024
…lvm#113527) This PR erases `spirv.mlir.loop` with an empty region in `LoopPattern`, resolving a crash. Fixes llvm#113404.
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
…lvm#113527) This PR erases `spirv.mlir.loop` with an empty region in `LoopPattern`, resolving a crash. Fixes llvm#113404.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR erases
spirv.mlir.loopwith an empty region inLoopPattern, resolving a crash. Fixes #113404.